Kill gpg agent in package-test.el to avoid a race

package-test.el should no longer fail during clean up.

* Previously a delete-directories call raced with the gpg agent's own
  cleanup process (presumably triggered by the first deletion of one of
  the agent's sockets).  As a result, it looks like the agent could
  delete one of its sockets after delete-directories had decided to
  delete the socket, but before it made the attempt, causing an
  exception.

* To fix the problem, explicitly ask gpg-connect-agent to kill the agent
  before attempting to delete the gnupg home directory.

diff --git a/test/automated/package-test.el b/test/automated/package-test.el
index c4c856f30315f19fd609bbdec43e6324da2afe04..7120112243696225907fdccbfc154bd72acf4107 100644 (file)
--- a/test/automated/package-test.el
+++ b/test/automated/package-test.el
@@ -149,6 +149,9 @@
                ,@body)))
 
        (when (file-directory-p package-test-user-dir)
+         (call-process "gpg-connect-agent" nil nil nil
+                       "--homedir" (concat package-test-user-dir "/gnupg")
+                       "killagent" "bye")
          (delete-directory package-test-user-dir t))
 
        (when (and (boundp 'package-test-archive-upload-base)